Remove the window from the toplevel_list here rather in destroy. While

Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkwindow.c (gtk_window_destroy): Remove
        the window from the toplevel_list here rather in destroy.
        While this is theoretically speaking wrong, it fits
        in better with the current reality that destroyed
        widgets are not reusable. (#126808, Michael Natterer)

diff --git a/ChangeLog b/ChangeLog
index 486506e65920d4b8784cf6d182f304c2dba42fb0..a63c1247f41efa9ed7306b9acbea536b6d215fbc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_destroy): Remove
+       the window from the toplevel_list here rather in destroy.
+       While this is theoretically speaking wrong, it fits
+       in better with the current reality that destroyed
+       widgets are not reusable. (#126808, Michael Natterer)
+
 Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 486506e65920d4b8784cf6d182f304c2dba42fb0..a63c1247f41efa9ed7306b9acbea536b6d215fbc 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_destroy): Remove
+       the window from the toplevel_list here rather in destroy.
+       While this is theoretically speaking wrong, it fits
+       in better with the current reality that destroyed
+       widgets are not reusable. (#126808, Michael Natterer)
+
 Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 486506e65920d4b8784cf6d182f304c2dba42fb0..a63c1247f41efa9ed7306b9acbea536b6d215fbc 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_destroy): Remove
+       the window from the toplevel_list here rather in destroy.
+       While this is theoretically speaking wrong, it fits
+       in better with the current reality that destroyed
+       widgets are not reusable. (#126808, Michael Natterer)
+
 Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 486506e65920d4b8784cf6d182f304c2dba42fb0..a63c1247f41efa9ed7306b9acbea536b6d215fbc 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_destroy): Remove
+       the window from the toplevel_list here rather in destroy.
+       While this is theoretically speaking wrong, it fits
+       in better with the current reality that destroyed
+       widgets are not reusable. (#126808, Michael Natterer)
+
 Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 486506e65920d4b8784cf6d182f304c2dba42fb0..a63c1247f41efa9ed7306b9acbea536b6d215fbc 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Sat Mar 13 15:19:17 2004  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkwindow.c (gtk_window_destroy): Remove
+       the window from the toplevel_list here rather in destroy.
+       While this is theoretically speaking wrong, it fits
+       in better with the current reality that destroyed
+       widgets are not reusable. (#126808, Michael Natterer)
+
 Sat Mar 13 21:47:47 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkcellview.c (gtk_cell_view_expose): Don't do anything

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 83d8c1cb73af734a1d9077254ba328013e562614..f80833d449394a031128911a4b760fff0501f9a7 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3500,6 +3500,8 @@ gtk_window_destroy (GtkObject *object)
 {
   GtkWindow *window = GTK_WINDOW (object);
   
+  toplevel_list = g_slist_remove (toplevel_list, window);
+
   if (window->transient_parent)
     gtk_window_set_transient_for (window, NULL);
 
@@ -3551,8 +3553,6 @@ gtk_window_finalize (GObject *object)
 {
   GtkWindow *window = GTK_WINDOW (object);
 
-  toplevel_list = g_slist_remove (toplevel_list, window);
-
   g_free (window->title);
   g_free (window->wmclass_name);
   g_free (window->wmclass_class);